Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Wed, 5 May 2010 10:17:53 +0000 (10:17 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Wed, 5 May 2010 10:17:53 +0000 (10:17 +0000)

Trivial merge